From 0c178e965c85dbc11720a98e97b50d49f0cdd2ec Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Wed, 10 Mar 1999 01:15:03 +0000 Subject: [PATCH] first lookup the xfont ID in our font hash table, if we have a Tue Mar 9 01:01:28 1999 Tim Janik * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our font hash table, if we have a GdkFontPrivate entry for this font already, simply increment its reference count, provided by Olaf Dietsche . * gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix provided by Olaf Dietsche . --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-0 | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gdk/gdkfont.c | 34 ++++++++++++++++++++++------------ gdk/x11/gdkfont-x11.c | 34 ++++++++++++++++++++++------------ gtk/gtkstyle.c | 1 + 10 files changed, 115 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd78beb12f..e297de11ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Mar 9 01:01:28 1999 Tim Janik + + * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our + font hash table, if we have a GdkFontPrivate entry for this font + already, simply increment its reference count, provided by Olaf Dietsche + . + + * gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix + provided by Olaf Dietsche . + 1999-03-09 Federico Mena Quintero * gtk/gtkstyle.c (gtk_default_draw_handle): Significantly reduced diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fd78beb12f..e297de11ae 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +Tue Mar 9 01:01:28 1999 Tim Janik + + * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our + font hash table, if we have a GdkFontPrivate entry for this font + already, simply increment its reference count, provided by Olaf Dietsche + . + + * gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix + provided by Olaf Dietsche . + 1999-03-09 Federico Mena Quintero * gtk/gtkstyle.c (gtk_default_draw_handle): Significantly reduced diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fd78beb12f..e297de11ae 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Tue Mar 9 01:01:28 1999 Tim Janik + + * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our + font hash table, if we have a GdkFontPrivate entry for this font + already, simply increment its reference count, provided by Olaf Dietsche + . + + * gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix + provided by Olaf Dietsche . + 1999-03-09 Federico Mena Quintero * gtk/gtkstyle.c (gtk_default_draw_handle): Significantly reduced diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fd78beb12f..e297de11ae 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Tue Mar 9 01:01:28 1999 Tim Janik + + * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our + font hash table, if we have a GdkFontPrivate entry for this font + already, simply increment its reference count, provided by Olaf Dietsche + . + + * gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix + provided by Olaf Dietsche . + 1999-03-09 Federico Mena Quintero * gtk/gtkstyle.c (gtk_default_draw_handle): Significantly reduced diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fd78beb12f..e297de11ae 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Tue Mar 9 01:01:28 1999 Tim Janik + + * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our + font hash table, if we have a GdkFontPrivate entry for this font + already, simply increment its reference count, provided by Olaf Dietsche + . + + * gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix + provided by Olaf Dietsche . + 1999-03-09 Federico Mena Quintero * gtk/gtkstyle.c (gtk_default_draw_handle): Significantly reduced diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fd78beb12f..e297de11ae 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Tue Mar 9 01:01:28 1999 Tim Janik + + * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our + font hash table, if we have a GdkFontPrivate entry for this font + already, simply increment its reference count, provided by Olaf Dietsche + . + + * gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix + provided by Olaf Dietsche . + 1999-03-09 Federico Mena Quintero * gtk/gtkstyle.c (gtk_default_draw_handle): Significantly reduced diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fd78beb12f..e297de11ae 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Tue Mar 9 01:01:28 1999 Tim Janik + + * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our + font hash table, if we have a GdkFontPrivate entry for this font + already, simply increment its reference count, provided by Olaf Dietsche + . + + * gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix + provided by Olaf Dietsche . + 1999-03-09 Federico Mena Quintero * gtk/gtkstyle.c (gtk_default_draw_handle): Significantly reduced diff --git a/gdk/gdkfont.c b/gdk/gdkfont.c index 91e728c592..d1f779a064 100644 --- a/gdk/gdkfont.c +++ b/gdk/gdkfont.c @@ -34,27 +34,37 @@ gdk_font_load (const gchar *font_name) { GdkFont *font; GdkFontPrivate *private; + XFontStruct *xfont; - private = g_new (GdkFontPrivate, 1); - font = (GdkFont*) private; + g_return_val_if_fail (font_name != NULL, NULL); - private->xdisplay = gdk_display; - private->xfont = XLoadQueryFont (private->xdisplay, font_name); - private->ref_count = 1; + xfont = XLoadQueryFont (gdk_display, font_name); + if (xfont == NULL) + return NULL; - if (!private->xfont) + font = gdk_font_lookup (xfont->fid); + if (font != NULL) { - g_free (font); - return NULL; + private = (GdkFontPrivate *) font; + if (xfont != private->xfont) + XFreeFont (gdk_display, xfont); + + gdk_font_ref (font); } else { + private = g_new (GdkFontPrivate, 1); + private->xdisplay = gdk_display; + private->xfont = xfont; + private->ref_count = 1; + + font = (GdkFont*) private; font->type = GDK_FONT_FONT; - font->ascent = ((XFontStruct *) private->xfont)->ascent; - font->descent = ((XFontStruct *) private->xfont)->descent; - } + font->ascent = xfont->ascent; + font->descent = xfont->descent; - gdk_xid_table_insert (&((XFontStruct *) private->xfont)->fid, font); + gdk_xid_table_insert (&xfont->fid, font); + } return font; } diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c index 91e728c592..d1f779a064 100644 --- a/gdk/x11/gdkfont-x11.c +++ b/gdk/x11/gdkfont-x11.c @@ -34,27 +34,37 @@ gdk_font_load (const gchar *font_name) { GdkFont *font; GdkFontPrivate *private; + XFontStruct *xfont; - private = g_new (GdkFontPrivate, 1); - font = (GdkFont*) private; + g_return_val_if_fail (font_name != NULL, NULL); - private->xdisplay = gdk_display; - private->xfont = XLoadQueryFont (private->xdisplay, font_name); - private->ref_count = 1; + xfont = XLoadQueryFont (gdk_display, font_name); + if (xfont == NULL) + return NULL; - if (!private->xfont) + font = gdk_font_lookup (xfont->fid); + if (font != NULL) { - g_free (font); - return NULL; + private = (GdkFontPrivate *) font; + if (xfont != private->xfont) + XFreeFont (gdk_display, xfont); + + gdk_font_ref (font); } else { + private = g_new (GdkFontPrivate, 1); + private->xdisplay = gdk_display; + private->xfont = xfont; + private->ref_count = 1; + + font = (GdkFont*) private; font->type = GDK_FONT_FONT; - font->ascent = ((XFontStruct *) private->xfont)->ascent; - font->descent = ((XFontStruct *) private->xfont)->descent; - } + font->ascent = xfont->ascent; + font->descent = xfont->descent; - gdk_xid_table_insert (&((XFontStruct *) private->xfont)->fid, font); + gdk_xid_table_insert (&xfont->fid, font); + } return font; } diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 323118dd3b..30a60363fc 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -362,6 +362,7 @@ gtk_style_copy (GtkStyle *style) new_style->bg_pixmap[i] = style->bg_pixmap[i]; } + gdk_font_unref (new_style->font); new_style->font = style->font; gdk_font_ref (new_style->font); -- 2.30.2